bitkeeper revision 1.1159.212.92 (4204921aEJqAV7p8MQEa98S3OLscXg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

diff --cc tools/libxc/Makefile
index a1fe7b93d68900841e94470ae5d54af298d32f2e,db605acdd2c0d2a9b38c572dc51d249edb74f91a..6920d1044442beaf1799538713b2014d8017e449
--- 1/tools/libxc/Makefile
--- 2/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@@ -3,9 -3,10 +3,10 @@@ INSTALL_PROG   = $(INSTALL) -m075
  INSTALL_DATA  = $(INSTALL) -m0644
  INSTALL_DIR   = $(INSTALL) -d -m0755
  
 -MAJOR    = 2.0
 +MAJOR    = 3.0
  MINOR    = 0
- SONAME   = libxc.so.$(MAJOR)
+ LIB_NAME = libxc
+ SONAME   = $(LIB_NAME).so.$(MAJOR)
  
  CC       = gcc
  

diff --cc tools/libxutil/Makefile
index ef821b9d281066408ccaaaddb1581aacc668549a,d9ac3b6e32391f773901451dc956cf24dfc80b9c..148492351d9a4875bd4b06d56f3a9634461eaed9
--- 1/tools/libxutil/Makefile
--- 2/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@@ -31,9 -32,10 +32,10 @@@ CFLAGS   += -Wall -Werror -O3 -fno-stri
  CFLAGS   += -Wp,-MD,.$(@F).d
  DEPS     = .*.d
  
 -MAJOR    := 2.0
 +MAJOR    := 3.0
  MINOR    := 0
  LIB_NAME := libxutil
+ SO_NAME  := $(LIB_NAME).so.$(MAJOR)
  LIB      := $(LIB_NAME).so 
  LIB      += $(LIB_NAME).so.$(MAJOR)
  LIB      += $(LIB_NAME).so.$(MAJOR).$(MINOR)

diff --cc xen/arch/x86/Makefile
Simple merge